[PATCH] <short summary of the patch>

TODO: Put a short summary on the line above and replace this paragraph
with a longer explanation of this change. Complete the meta-information
with other relevant fields (see below for details). To make it easier, the
information below has been extracted from the changelog. Adjust it or drop
it.

Gbp-Pq: Name Version_2_7_2pre31

diff --git a/git.tag b/git.tag
index b5a6fe3b047c84f08a1d6bfffd868861986d3272..18f43b771458ea65b1c0c2587660465cfdfe934c 100644 (file)
--- a/git.tag
+++ b/git.tag
@@ -1 +1 @@
-"Version_2_7_2pre30"
+"Version_2_7_2pre31"

diff --git a/h/pool.h b/h/pool.h
index 646520f214b509536d15b51ce4c40173112d2aa7..4c219081b227858fdb9b9306062716473ce72426 100644 (file)
--- a/h/pool.h
+++ b/h/pool.h
@@ -111,16 +111,20 @@ open_pool(void) {
 void
 close_pool(void) {
 
+  static int no_recur;
+
 #ifndef NO_FILE_LOCKING
-  if (pool!=-1) {
+  if (pool!=-1 && !no_recur) {
+    no_recur=1;
     f.l_type=F_WRLCK;
     if (!fcntl(pool,F_SETLK,&f))
       massert(!unlink(gcl_pool) || errno==ENOENT);
     register_pool(-1);
-    massert(!close(pool));
     massert(!munmap(Pool,sizeof(struct pool)));
+    massert(!close(pool));
     pool=-1;
     memset(gcl_pool,0,sizeof(gcl_pool));
+    no_recur=0;
   }
 #endif
   

diff --git a/o/disable_aslr.c b/o/disable_aslr.c
index a84a650632ae618e51441a91bcd5a404ee147cb4..77e18ca94a178d69b1f1222e10cc158633377eb1 100644 (file)
--- a/o/disable_aslr.c
+++ b/o/disable_aslr.c
@@ -132,6 +132,14 @@ disable_aslr(int argc, char **argv, char **envp) {
   }
 
 }
+
+#else  /*Unneeded on Hurd, cygwin/mingw via coff header flag*/
+
+void
+disable_aslr(int argc, char **argv, char **envp) {
+  return;
+}
+
 #endif
 
 #endif